Merge from emacs-24; up to r108040
authorGlenn Morris <rgm@gnu.org>
Thu, 21 Jun 2012 07:34:27 +0000 (00:34 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 21 Jun 2012 07:34:27 +0000 (00:34 -0700)
commit52d9cd12a2880ba6a95275737a5c3644c2473cf8
tree674f9fd3a4143ff16ca4bcf3e895022e6bcb65b6
parent34fef8bd56149466b909f38b911def7e8ac72671
parentfb0219efd1196df7de538a27159367b8220b9a8a
Merge from emacs-24; up to r108040
doc/emacs/ChangeLog
doc/emacs/Makefile.in
doc/lispintro/ChangeLog
doc/lispintro/Makefile.in
doc/lispref/ChangeLog
doc/lispref/Makefile.in
doc/misc/ChangeLog
doc/misc/Makefile.in